projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6008737
)
(merge_face_ref): Specifying `unspecified' is a no-op.
author
Richard M. Stallman
<rms@gnu.org>
Mon, 16 Aug 2004 22:53:28 +0000
(22:53 +0000)
committer
Richard M. Stallman
<rms@gnu.org>
Mon, 16 Aug 2004 22:53:28 +0000
(22:53 +0000)
src/xfaces.c
patch
|
blob
|
history
diff --git
a/src/xfaces.c
b/src/xfaces.c
index f78ecacee1ac1318c112df421e2d98ff9e0d7211..aafd762b73be63bf5dea9996a91a2d54c7c279aa 100644
(file)
--- a/
src/xfaces.c
+++ b/
src/xfaces.c
@@
-3626,7
+3626,10
@@
merge_face_ref (f, face_ref, to, err_msgs, named_merge_points)
Lisp_Object value = XCAR (XCDR (face_ref));
int err = 0;
- if (EQ (keyword, QCfamily))
+ /* Specifying `unspecified' is a no-op. */
+ if (EQ (value, Qunspecified))
+ ;
+ else if (EQ (keyword, QCfamily))
{
if (STRINGP (value))
to[LFACE_FAMILY_INDEX] = value;